auto upstream

diff --cc lisp/mail/rmail.el
index e32d3c608d473be31e4421aa50c47cf660a91e33,e32d3c608d473be31e4421aa50c47cf660a91e33..c6385498dcd54fe3fb0d51a7be027ba75c6358be
--- 1/lisp/mail/rmail.el
--- 2/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4647,7 -4647,7 +4647,7 @@@ With prefix argument N moves forward N 
  
  ;;;***
  \f
--;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "1f33964668345a1a1f3119fece148227")
++;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "93951f748e43e1015da1b485088970ca")
  ;;; Generated autoloads from rmailmm.el
  
  (autoload 'rmail-mime "rmailmm" "\

diff --cc src/emacs.c
Simple merge

diff --cc src/xterm.c
Simple merge